group/views.py

@@ -28,7 +28,7 @@ from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, ge

                 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_PASSED_SET
              

                 from utils.redis.rlock import upload_lock
              

                 from utils.redis.rorder import get_lensman_order_record
              

                -from utils.sql.raw import PAI2_HOME_API
              

                +from utils.sql.raw import PAI2_HOME_API, PAI2_HOME_WX_API
              

                 from utils.storage_qiniu_utils import file_save
              

                 from utils.time_utils import origin_expired_stamps
              

                 from utils.url_utils import share_url
              
@@ -616,7 +616,7 @@ def pai2_home_api(request):

                 
              

                     # 执行原生 SQL 语句，获取首页照片列表
              

                     cursor = connection.cursor()
              

                -    cursor.execute(PAI2_HOME_API.format(
              

                +    cursor.execute((PAI2_HOME_WX_API if request.weixin else PAI2_HOME_API).format(
              

                         user_id=user_id,
              

                         offset=0,
              

                         rows=settings.PAI2_HOME_MAX_ROWS,
              

utils/sql/raw.py

@@ -13,3 +13,17 @@ PAI2_HOME_API = (

                     r"order by DATE(T3.created_at) desc, FIELD(T3.user_id, '{user_id}') desc, 7 * T3.thumbup_num + 3 * T3.comment_num desc, T3.id desc "
              

                     r"limit {offset}, {rows};"
              

                 )
              

                +
              

                +PAI2_HOME_WX_API = (
              

                +    r"select "
              

                +    r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T2.group_from, T3.photo_id, "
              

                +    r"T3.photo_path, T3.has_watermark, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, "
              

                +    r"T3.photo_thumbnail2_path, T3.photo_thumbnail2_w, T3.photo_thumbnail2_h, T3.user_id, T3.nickname, T3.avatar, "
              

                +    r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.session_id, T3.nomark, T3.origin, T3.created_at, T3.lensman_photo_id, T3.lensman_type "
              

                +    r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1 and status=1) as T1 "
              

                +    r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id "
              

                +    r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id "
              

                +    r"where T3.status = 1 "
              

                +    r"order by T3.id desc "
              

                +    r"limit {offset}, {rows};"
              

                +)